From c203e62724fc3b1067e67dfd34893b943024ecb4 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 1 Aug 2012 08:41:17 +0000
Subject: [PATCH] gcj-safe-jni-h-include

Gbp-Pq: Name gcj-safe-jni-h-include.diff
---
 configure.in | Bin 344289 -> 344434 bytes
 set_soenv.in |   4 ++++
 2 files changed, 4 insertions(+)

diff --git a/configure.in b/configure.in
index 0db6452e63f4a67226e5f52886ed896eafec3fc1..a5032339b3e7e9b09f7ab1b17c3a46961e9557d6 100644
GIT binary patch
delta 196
zcmaFZDEg^Mw4sG@3lp1Hw7aucyqBM6yr-YDPpFHlZGwuIW0+&Shrh3@eo|(hetL42
zg05~sQD$C=Zdztes%~ClZmL3NUUE)pN~(TVUZ!4#LXCn-u&axLZmL4DP7Fj$M<+dD
zx*;=@)b#g0Ou`}xx}GX%HYrWd%Vm_AF7M04vpv|0={%c+qjP+4s8eu=2Aaz0jdvKM
R+N%PYfS7rERUk|HdjR<6J`Df>

delta 43
ycmey=B>J#Xw4sG@3lp2y^eitXmFbnfOq$zIc`==5Yu_Bm1jNkSHwUupe-8j|zY#A0

diff --git a/set_soenv.in b/set_soenv.in
index e3d48a18e67..57927a02997 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1311,6 +1311,10 @@ if ($platform =~ m/solaris|linux|freebsd|netbsd|aix|openbsd|dragonfly/ && '@CROS
 
         $SOLARINC .=$I.$JAVA_HOME.$INCLUDE.$ds."native_threads".$INCLUDE;
 	}
+        if ($JDK eq "gcj")
+        {
+                $SOLARINC    .= $I."@GCJ_JNI_INCLUDE@";
+        }
     #The tail, if needed
     if ($platform =~ m/linux|freebsd|netbsd|aix|openbsd|dragonfly/)
     {  if ( $XINC ne "/usr/include" && $XINC ne 'no_x_includes' ) {
-- 
2.30.2